Merge 35cf597037cee1510c2e3a57b249364550153870 on remote branch

Change-Id: I0f37894e3dbd37502ca29f18ac032f6c63823831