DO NOT MERGE ANYWHERE Actually fix cts in nyc-dev-plus-aosp
am: 4a0758045c  -s ours

Change-Id: I7c670287304269c38e12f50e71e242b8b2d77068