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

* commit 'd97e99f7d4665530a699bb72ee694174cb938536':
  Remove temporary file on user builds.

Change-Id: Ie53c87ba8508d024ac0bf55a62c8934fb323ccc1