Merge "Move start advertise method to advertising interface (2/3)" am: 8ba3a3007e
am: 204b309411

Change-Id: I7894a7e8b0dbd8fe1fdf46bd97c7df9771cd75c6