Merge 7e6f3258070a5dc7aea0458a204d18818abd7e20 on remote branch

Change-Id: I13a353b41471189e7dfa754c020160829e5b8e62