Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 0040179a75

Change-Id: I6ef34c3d75ea5a5cd315c3cf4c1e3604002aaf2f