Merge "Remove temporary file on user builds." into nyc-dev am: d97e99f
am: 53925d2

* commit '53925d208ade2f844f018ed2ca0fb042ce7db85d':

Change-Id: I46ab1ff4f26c72a199337a8de0876240ac985e98