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

Change-Id: I9d6da85552f711b4dbef127cf43422dd8a561ce2