Merge "Allow CreateResizeDeleteLP test case to run on non-A/B devices"