Merge "Clean up the uncrypted OTA package on bootup." am: 5d562d4d2f
am: ac140e7f76

* commit 'ac140e7f7690979378897546e7934381f62922ab':
  Clean up the uncrypted OTA package on bootup.