Merge remote-tracking branch 'aosp/master' into HEAD

Change-Id: Id351ee8992a845d1ddd395d9947176e2a3489de4