Merge f00bdc00cacea4c75065004d4ede0445b42c32e0 on remote branch

Change-Id: Ibaddecce24d0883f7ab06fc471147b53fbd5e236