To minimize the steps required for device preparation. Fixed: 320200171 Test: build pass Change-Id: I271389b0c4a7fe453902db2e8971e881c72bca35
To minimize the steps required for device preparation. Fixed: 320200171 Test: build pass Change-Id: I271389b0c4a7fe453902db2e8971e881c72bca35