Merge 50b9701ad29f45ae0f49a189f58972e41cdbd1af on remote branch

Change-Id: Icac181fe206e3b41e71afd1cbde8462a079ca5f2