Merge 2fae15b76f3b3826656a2b34c5c9562a5ead9243 on remote branch

Change-Id: Ice95c53687eff727d4670be597af043078ee3d03