Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: e3e1107fc6 am: 86f459097d
am: 42099c645e

Change-Id: I86d1835828a119f1cde9c37705801d22a799be89