Merge a58e9dd5f320809806b7d686d9eb66356dda99f8 on remote branch

Change-Id: I59217a61531cd5a47133d6a118fc7a8f37520195