Merge 475ab92f24f71d13ca2f6078edcccd04defd4211 on remote branch

Change-Id: I9815c3511a7d6a10b2187cfcfba5d7fb999dfef7