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

Change-Id: I42bb33603da8544ec2ffd287e34370eebeeaf171