Merge "DO NOT MERGE Avoid test failed for tablet device" into pie-cts-dev