Merge changes I69cdbb16,I6975e0b7 am: d889cb5098 am: ac913d725f am: 93d68de285 am: bb0edef6e8
am: 7ea7b0b1f1

Change-Id: Ie87981017bf2d4deef2092407c31fb3df4464dc8