Merge changes I790baf5e,I133f4861 into pi-dev
am: 08bc7ef4c4

Change-Id: I7d4a78e3b1ff25a5efbf88aa0f4d05be4129926d
tree: 482ff5e438e7028bdd2939be069e082d74d2c10d
  1. service/
  2. PREUPLOAD.cfg