Merge 4c60420cdfa12885ad5f74b812c1751f04747cbe on remote branch

Change-Id: I373580af045eff8574c66db42ecd85812dd7dd60