Merge remote-tracking branch 'upstream/chromeos-6.1' into chromeos-6.1__release/core76-47

Change-Id: Ic46aa513dc10eca79103283408e2405004a73e06