Merge "[automerger skipped] Merge "DO NOT MERGE Avoid test failed for tablet device" into pie-cts-dev am: 075244741c -s ours am skip reason: subject contains skip directive"