Merge 54ac271d8bb256274df5f91f31c312e67d592f68 on remote branch

Change-Id: I147e6de67017fab0b032bb9aebeaf0e0f950a403