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

* commit '96b80774b7d93d9f1339a7e3da4052e044fb286f':
  Remove temporary file on user builds.

Change-Id: I34148e26006869866379ea5dabb2a37cab4b3a18