Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 4d49da003f

Change-Id: I61fb100778ed96426bd8ecc45ffd4c99bcf72d5e