Merge changes I5c16c650,I3151fb6b am: 55efea25f3
am: ad2684ca3d

Change-Id: Ia0d1205b09b4770a4df46604d947c7be7aca8fb5