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

Change-Id: I19a68fe2794acc1a5806dca8b336806d73850e9f