Merge f4dc944333c54a5455d17b6bd7c02d2ededb6e4a on remote branch

Change-Id: Ic73cbf452cf633a503848271c3904abbc14a90c8