Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev
am: 1ae521df6a  -s ours

Change-Id: Ia6895c898e6757d51e8c7a2e2bfe9351a2413198