Merge 4fbfa6ec4e631b43cc4f8ec8a15ce42e5d2ebf0c on remote branch

Change-Id: I2d72eb0b4da2cbe491fca9ac241015f80959e54a