Merge "Unify advertising API (2/3)" am: 9fe1a712fb am: 1ea50bd0ea
am: 049eb03d1f

Change-Id: Ib6004aa3cd40527b4cf5c45fbe8bb6b44f9fc02f