Merge 6b8d1e374d35be9a0e1803b509304d33bd17bf68 on remote branch

Change-Id: I552da3017130004e56bd191b0f3b2760e182818a