Merge "[automerger skipped] Merge "DO NOT MERGE:Skip testSanity for the data only devices" into pie-cts-dev am: 8d229f6908  -s ours"