Merge d192fab5b7a7df3fe2cc1650dfa19b55e027c5d8 on remote branch

Change-Id: I4bcbc77c89f734f1e11b97524f23848135feb452