Merge "fix crash issue when run cts case camera its test" into pie-cts-dev am: a2dae2d497 am: 96fba2b4b3

Change-Id: I81215f92f0740c63dc197c6e3b2228042a7e3b4a