Merge e39136b349ec211e76006de4b0b0142d2ba06c55 on remote branch

Change-Id: I023489ee9a3b19bf2c744277fbe9b8d693fc14f4