Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: 18205ff9d7 am: f2b61b0f1f

Change-Id: I82092aecaafe592156e3945fd3bee32517a83239