Sample config update

Update the sample config post token persistence relocation.

Change-Id: Ia9dc3c6be9e7c619651cd6fa1d9bb8bd71806d9b
bp: non-persistent-tokens
Merge "Sample config update"