Merge 58fe0d31e4a14f3e55eb507442e425fb7e556932 on remote branch

Change-Id: Ie85815adc7b6dd31cbc7f34ad5bdbe8525d0e56d