Merge changes I31b6a66a,I682e5c98 am: a5d5c9debc am: ea62682f73
am: 580bf66a32

Change-Id: Icb2a71981a319e5a83da2568dabae396ba972ec5