Merge cherrypicks of [2666757] into nyc-mr1-security-f-release

Change-Id: I390ea8502656b5a71bff8e0a7937078847e88e8d