Merge b1ecab8ad8305d26e1c51756acd751c926577436 on remote branch

Change-Id: Ie9f6cf47a9370092ff75c2ee3eb9430c7b04e4d4