DO NOT MERGE

Cherry-pick from GB to HC.

Update sample app for final GB MR API changes.

Change-Id: Iab3b879d1a53b70cbffd51011c77699325e21dad
1 file changed