Merge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev
am: 50e8e64c45  -s ours

Change-Id: I1ef606566d2c1dfbe6ff273e073a45b72a0d788f