Merge branch 'cros/master' into 'cros/debian'

Change-Id: I9596a8cd45604b779f082a2bb7c98513c8bd6d54