Merge a71d258a09c2724a6de76d677e2093817e9f94c9 on remote branch

Change-Id: I5b6153f2f878892fc9890c5134a6eb17edf1426a