tree 5610573d1d9f2a3ad535bb739e6d3226aed5e403
parent 04a5e3b4ead463efbb117941e44cd0efda89a72b
parent bfcb407ee0e759c9c151756c9c795c697e38e6ab
author android-build-team Robot <android-build-team-robot@google.com> 1496946337 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1496946337 +0000

Merge cherrypicks of [2379347, 2379239, 2379364, 2379160, 2379220, 2379290, 2379348, 2379328, 2379329, 2379349, 2379350, 2379365, 2379401, 2379351, 2379330, 2379313, 2379382, 2379275, 2379331, 2379352, 2379292, 2379314, 2379315, 2379402, 2379421, 2379369, 2379255, 2379317, 2379404, 2379279, 2379334, 2379372, 2379335] into mnc-mr2-release

Change-Id: I43a3ab772f5e8332276b6d0ce4437be50a0c74ec