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

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