tree 1cc432aba09db78896b8d42036f22686d5fd0a39
parent ec1cdf05ff1433be557eab8cf13186e0bd1a9086
parent 4cf46ebf18779a3954967193e17f9856abb0efab
author android-build-team Robot <android-build-team-robot@google.com> 1496172055 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1496172055 +0000

Merge cherrypicks of [2331043, 2330986, 2331024, 2331025, 2330859, 2330970, 2331044, 2330893, 2330950, 2330951, 2330940, 2331045, 2330954, 2330799, 2330987, 2331004, 2331061, 2331005, 2331047, 2330955, 2331030, 2331031, 2331101, 2330972, 2330956, 2331032, 2331006, 2330894, 2331063, 2331064, 2330895, 2331048, 2331102, 2331035, 2331007, 2331083, 2331103, 2331104, 2330897, 2331084, 2331067, 2331009, 2331010, 2330898, 2330989, 2331105, 2330899, 2331011, 2331069, 2330990, 2331121, 2331122, 2331086] into nyc-mr2-security-a-release

Change-Id: I9fc31945c65fbea0cca83f127469b94601789ec0