Merge cherrypicks of [2666915] into nyc-mr1-security-e-release

Change-Id: I1cbd822cba6ea56a753d086d9d8714a9086fb48b