Merge 52690985f87fce2afff046beb40bd97baad57441 on remote branch

Change-Id: Ie806684b3173e9c78f2182b5d50c541b1e00c24f