tree 946735bf814433d391aa56f7bfd999aecb8f7eca
parent dbc78509ae948f47fcafca64778b77ee3cd2b266
parent a81076b2e8a157f6ec10f75e1152ae518dcf7365
author Phil Weaver <pweaver@google.com> 1500425279 +0000
committer android-build-merger <android-build-merger@google.com> 1500425279 +0000

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12  -s ours am: 9e39e1e548 am: afdcad0df3 am: edbe4bd86a am: 2da30457c5 am: d761dad216
am: a81076b2e8

Change-Id: I1601d89e5c39e68361b03dff475f312d0e7fc22e