[automerger skipped] Merge "Use commas to separate API exemptions list, not colon." into pi-dev
am: d598caacfc  -s ours

Change-Id: I4a79f5554df80d75c00f66c86d6655d34d4b961d