Merge f92e64627e09013f04ad4365a4c8f682d3777f88 on remote branch

Change-Id: I19b34d3c80c2d95b8b8bcc790687cbd82f5784a6