tree 14d0ca6d6e8e77e27663b9fac5304b7b125ee9ce
parent 18cd9b58775e53b2ec1ffe571d165ad8fddfeff4
parent 5b5f81c36fd1239e71b278d9b902eb7d0241014c
author android-build-team Robot <android-build-team-robot@google.com> 1523659647 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1523659647 +0000

Merge cherrypicks of [3898937, 3898958, 3899077, 3897885, 3898496, 3898245, 3898959, 3898960, 3897790, 3898312, 3898313, 3898314, 3899155, 3899156, 3899157, 3898289, 3898290, 3899061, 3898291, 3898292, 3896951, 3899158, 3898961, 3898938, 3898246] into sparse-4657601-L30800000163316240

Change-Id: I7fb38efbc6add86c8877cb20e040e7adf87dacf6