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

Change-Id: I8cbe2f5d03cf10879417504446db80b38de10157