Merge "Add testcases for restoreKeys API." into oc-dev
am: 007d23e7cb

Change-Id: Ib33b89c56caac065cea5cffe82c54e4f7158c682