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

Change-Id: I25d4d2a54ec29c1f44b5a5d020b33510939ca49b