tree cc8ec437804acdfaedfb040bfdbc1251cce8bcb1
parent 3496e177ae0c9cf0703c69f72fb65726fb95cfa7
parent b0c4ec04002d244171e395ac5814bf626f00058f
author android-build-team Robot <android-build-team-robot@google.com> 1507140692 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1507140692 +0000

Merge cherrypicks of [3012829, 3012750, 3012751, 3012600, 3012601, 3012602, 3012603, 3012849, 3012850, 3012869, 3012870, 3012871, 3012872, 3012873, 3012630, 3012631, 3012632, 3012633, 3012634, 3012752, 3012753, 3012604, 3012605, 3012606, 3012929] into oc-r2-release

Change-Id: I21ba3aec84e386eb76cb9af65b37d1c9352b6aff