Merge remote-tracking branch 'goog/nyc-mr1-dev-plus-aosp' into HEAD
am: 7c87e420cf

Change-Id: Id555e71ab360d8621bd48c361cd5297f5270a2f2