Merge 85e7d41a537adc899e201b853aa8c8e8b952e191 on remote branch

Change-Id: If37ecb103c95d9da530f46a2088ce38bc00a84a9