Merge e585160990fd132802b39ae46b7103e75a8b1538 on remote branch

Change-Id: I18a850644f592d4e79065b097e0c9c8a9e21c30b