Merge 9cf3017b600c9fd71b3ce4a9a190509d42f08f45 on remote branch

Change-Id: I32759026e541117b3b7d248e3011435341887e73