Merge 3fab6d5c5a47c3fdd74524041062de7395af8828 on remote branch

Change-Id: I829e29c36befaed3d0d8ea9766a592f9fa54f523