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

Change-Id: I9aa8d7ba7efd4f0a9c928da94a15a7419f2aab0e