Merge d16c500a6b043501c79de9753a3ace0f9b0c9f13 on remote branch

Change-Id: I8f9b379fe7efad063a410bf1adfbc0ed4c76c1cc