Cherry-pick from GB to HC. Update sample app for final GB MR API changes. Change-Id: Iab3b879d1a53b70cbffd51011c77699325e21dad
Adding a new folder in development/samples is not enough to have it be packaged with the SDK. Make sure to edit development/build/sdk.atree to add the sample to the SDK build.