Merge 3ea8246e1fcb977da03314af95a86be6193edf47 on remote branch

Change-Id: Ie7c7ea4d8b1fe36489938783aeecdf68bdfec661