Merge 434185a5e0f50624d12d3a86011b2b1118583580 on remote branch

Change-Id: I35f282d64d2954d5da4a621d409876136bfef4c2