Address further API council comments. am: 0b8e95c044

Change-Id: Iaf737460a7c4e14e1ac0c8e177094fa517993aa7
tree: 8b233d57955cabe4509129d2da2055e97be67afc
  1. service/
  2. PREUPLOAD.cfg