Merge "Clarify how to replace cert generated by Android Keystore." into nyc-dev