Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 89da093d4b

Change-Id: I8c3f05543a27a062695038cf9723fa44ad8a5228