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