Merge \\\\"Don\\\\'t depend on Bouncy Castle.\\\\" am: 1fb96c3ff5 am: 3b36c7960d am: 37a8cc5f51
am: e31799e124

Change-Id: I18fbb9eb0f2af7d6dd4a60ee42cab0497ec89057