Merge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev
am: 0731806

* commit '07318065b22ba13ae003d7803a3e48e441f9f6e5':
  Make sure FIRST_LAUNCH is after PACKAGE_ADDED

Change-Id: I9fa2d5e99104224f644a420a140f2a27dc5e04da