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

Change-Id: Ice673d86314e72da1d993cd9651fef1f4ef8967e