Merge d2a86160d41ee77d1c9b122af8ed848c735ae38f on remote branch

Change-Id: Ia19ce590d1e2f06b6d9207efa5df2655600d762a