Merge fdf100bd7b07a03638059cc45e36caf65047e821 on remote branch

Change-Id: I77c645a916ce596c7a5c9679e5785728dd75937b