Reuse string

Change-Id: I03829df23dcd1d31c0221b9b4880ba798165c981
Merge remote-tracking branch 'github/jellybean' into dspa