Merge 25066915746f0da96afba44777f8eb6b3bfed87c on remote branch

Change-Id: I1810ad6d67088622f148f0801d45eb51f922b64c