Merge changes I1cae6530,I7ffaa260 am: e34d239023 am: 81b5c744e8
am: d1c2b409fa

Change-Id: I8feb7a9ab5001b30029fa0a6d5df2304553e0c5f