Merge b39e44f6a81ce5a7fa1fce31dbfddf98e024d573 on remote branch

Change-Id: I429a29c2c77976206d5be24451025ecea0dc9bca