Merge changes I69cdbb16,I6975e0b7 am: d889cb5098
am: ac913d725f

Change-Id: I6f6458883392a396ff831c6ddd74295e00daae0f