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

Change-Id: If19569bf62e7f062dbd8a34d87dfbccd748e7ec6