Merge d67ff5785fd61b6349b015dd58d36f6796ddde6d on remote branch

Change-Id: Ifa60ec9e36ed842a1a42c8b44e42980382e50084