Merge 902d54ac019a9085244b645df717bdd77ecb4101 on remote branch

Change-Id: I4a84b600c4f243860f720b0f46fa9d034a75f10d