Hybrid toggle

Change-Id: I07d51c653c5d01fee2cba4100b35b9a09781eefd
Reuse string

Change-Id: I03829df23dcd1d31c0221b9b4880ba798165c981
Merge remote-tracking branch 'pa/jellybean' into fjpa