Merge changes I60f883c0,Ie5955865 am: 8c3e940324
am: 3eaaa508e9

Change-Id: I5c3b74944fe4c9899f3692553584130f94b6fdc2