Merge "Update keystore to use KM4.1." am: c0ef4595c8 am: 840fd26eb0

Change-Id: Ib93cb21f1ebf8bf73b9aedf74a1b05d186f2cf1e