This reverts commit 8c2a1a90a8.
Conflicts:
cmds/keystore/keystore.c
Bug:4970237
Change-Id: I626023d695becfada47e5f319b18e0889b766563
This reverts commit 8c2a1a90a8.
Conflicts:
cmds/keystore/keystore.c
Bug:4970237
Change-Id: I626023d695becfada47e5f319b18e0889b766563