Merge 41fdaeb72cd3551220fa756ff034c43daf7c1aa0 on remote branch

Change-Id: Id23026b1b9719c9bb422bbba38ed1670fa47c0da