Merge 599929c062be56d0c4d06f22eb931c6654526e17 on remote branch

Change-Id: I44895419bdf3ebd4becb2db7b0bcdf5304a9a429