Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev