Merge 86df2ba3e1e71cc0eff65112441507737fc3688d on remote branch

Change-Id: I690c2a2d78ad0a853be66fb2c2f0ec57500c428f