Merge b5da5b77e3fb961df036e83fa7fb123046981df2 on remote branch

Change-Id: I13d2acffb03bcc6c18e6f30c1797004dda1dda86