Merge b6b6edb6bc087bd46fc1e25b3e6eafc8b020abc8 on remote branch

Change-Id: Ib0978018a916582fc5fa9d1b8102baefcb4caf31