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

Change-Id: I8d7b7b3ef469f0882fbb372b2ea90a1956390327