Merge "Merge "Fix issue that "Device owner provisioning" fails in "No Device Owner Test"." into pie-cts-dev am: 780b75e1f6" am: ff140b9bb0
am: b8c28ece4c

Change-Id: Ib42f77704973508121fff3749d4161564af21b3c