Merge bdabd5be6d47d5be5dc527f7336df95ee62d97c4 on remote branch

Change-Id: If54def0e844f7495d83c834c34394869c05a318d