Merge changes from topic "keystorebp"
am: a12eab69d1

Change-Id: I4a6f7f84d683582d126a6370e1cf3ae6ee9f4b19