Merge branch 'chromeos-verity-3.4' into chromeos-3.4