Merge 9c41253a7c5f7842631d83adc8fe74c0cffa5522 on remote branch

Change-Id: I327d5381186010514c2cf444812daf081645f832