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

Change-Id: Idc241e28be92baae161ca051aa0d206a0de1795d