Merge changes I10561d93,I05d248a7
am: 87c39032ab

Change-Id: Iedaa2b325107cc9544269eb9a05ec7af5fc7a561