Merge remote-tracking branch 'aosp/upstream-master' into dev

Change-Id: Ie907154390e7addefb9ef8cd16fcf48e92a9e2ad