Merge c418b0761aea60de77f4dee0a130364af998ab15 on remote branch

Change-Id: Ic8326623abdc50b771bfbe7a7caa39105598ae5a