Merge 50b9701ad29f45ae0f49a189f58972e41cdbd1af on remote branch

Change-Id: I259368ad863a5df9bac86da8a8f5ed01708c12c4