Merge 8bc45356eb82fc4002c7a2d5a82667b094074765 on remote branch

Change-Id: I371a6a4e74ae41f6e4b42b995e6b2d0fc0f604d9