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

Change-Id: I5bac345ad36f06b033d26f7911d73e3f80ef1d6e