Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 63fd9cc1fc
am: 5ff310359f

Change-Id: I2a8ba246c8dd8f794f8ceec41e3ce6f5db41b186