Merge d2ae93cdfdd5a16b062806b2b5e586fd6edf5702 on remote branch

Change-Id: I40af70806d95c013aa689a4e722bd23927b8c4f5