Merge 85b131c50bc608f86624b2f1df22311ce0854771 on remote branch

Change-Id: I0f85026df5e98a4bc03c3bfc6cda1f5807a39534