Merge 48b9bea080c881d0ce2bb5e65bc93417838f41a2 on remote branch

Change-Id: I99cda4dc75d2afe24ed5192ba6cccfe1a6a86c67