Merge changes I042f25f8,I973f42c5,Icb4acea5 am: 78f94a39f2
am: 96cf6ece63

Change-Id: Ia672a2208917083908b6eaff18f582da1e360919