Merge cherrypicks of [2780919, 2780841, 2780458, 2780892, 2780893, 2781183, 2781184, 2780842, 2780843, 2780920, 2780921, 2780922, 2780923, 2780924, 2780925, 2780926, 2780927, 2780894, 2780895, 2781304, 2780844, 2780845, 2780846, 2781209] into nyc-mr1-security-e-release

Change-Id: Ia0d5991e0cbfaa1dfc54381c38175ca9b46aba86