Merge 4a37cb92faaa4107b8546e2910d576db47a77d05 on remote branch

Change-Id: I5e4d612c5af8e20347f5c509a891c45a06e0d646