Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: a67c00187b am: 37c75fea56
am: 8196e0266f

Change-Id: I3e07749aab3b0731b9bf66418a1fc03d7c5b723f