Merge 43d588d2c2cecbdbe349fcc7d82f687a485e4f6e on remote branch

Change-Id: Ib633871e27dfbf966ba0abb4ae5f4a48e4504c26