Merge \\"docs: Noted \\"Crypto\\" removal\\" into nyc-dev am: 8d7b4a4945
am: 8c59ca6902

Change-Id: Ief92ee6d42efaed06c0d74b234d96bfa6adf44a1