Merge f2dcb5c865a18308ea28402825c1240dd4f72433 on remote branch

Change-Id: Ia4b4a041c55be8cf2d47ce0c9bf20dabc9f478cc