Merge "DO NOT MERGE Change test case that's only meant for productivity devices." into arc-apps