Merge f11dc05b6688a9f9edd4098f501b32677c02018c on remote branch

Change-Id: I030c6b2aab0f80e4e351a1f33c7ac15f40e208fe