[automerger skipped] Merge "Reorder parameters as per API council reccomendation" am: 2465092de6 am: bc28e5bac1
am: 3fff4d7124 -s ours
am skip reason: change_id I9ae51383d7eeabdd140bc8bb0ab67bb1462d5fcb with SHA1 88ae0fed54 is in history

Change-Id: I2e908f4f2424067bbb89182c390c593d350ee640