Merge changes I64d793ba,I08bf7a9e,I68d579ba am: 1686af001e
am: 04971ae6d2

Change-Id: I467f38abee8be6b0bf944260195d713259c878a3