Merge remote-tracking branch 'cros/upstream' into 'cros/master'.

Change-Id: I22368813ff52c203507d5a72cbed75d3769e2be5