Patch Set 1:

Ahem, sorry if I mess things up here, I'm new to Gerrit...
Actually I wanted to submit just two changes, I969f3931 and one with the changesets that fix secure storage usage.

I didn't expect to create one review request per local commit...