Merge 205c5a952a818bc54729ea0bcfc87e48374f6c46 on remote branch

Change-Id: I469aad5dbe536d74bc08aca699c7cf4c304e9bc3