Merge sample

Trying to figure out why APNs not up to date.  If no joy, tomorrow I will make a prebuilt in vendor.

Change-Id: Id6d5062d888c60d306a0afa586bd923e9d88dbfa