Merge changes I2079344d,Ie0d08494
am: 302aa98f75

Change-Id: I9ca5d6c4f923f5c12414509da4845982865ff568