Merge "add keystore support to TF console."