Merge changes I2079344d,Ie0d08494 am: 302aa98f75
am: bfed101a33

Change-Id: I21b656f4e92a3bdad31ee584b2970a0bfe6fb999