Merge 8e94d16982fe6da3a310fd57428f0ac3a8da1ec1 on remote branch

Change-Id: Iddda5ecac631207db429ebbb5784e34c190f5554