Switching keystore to C++17 am: f9e0ec3a9d
am: 87f780d30b

Change-Id: I28b3ac17dac84766c0b70494f148b18803994b3b