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

Change-Id: I90794633718ee2f25df45b43f89d4793ac500522