Merge cherrypicks of [2666758] into nyc-mr1-security-a-release

Change-Id: I57484724edbf47e867315ce445015ea810e5df21