Merge changes I64d793ba,I08bf7a9e,I68d579ba
am: 1686af001e

Change-Id: I76942154db5b3c277d0248ca4d892ed42cb62c59