Merge f6032573273d88d015148910d4e6ae600184f8f6 on remote branch

Change-Id: I159a938135b67007bddc3aaf12aad2a494477026