tree 9f43c9f35e3bacbad225375ccd341c436cd59c04
parent 875a77b6e1c6b9bd6d536972c8db385cb4becfe9
parent 2f6f6abe4d05282c82dd56fa897949f49ac3cd6c
author Xin Li <delphij@google.com> 1501625477 -0700
committer Xin Li <delphij@google.com> 1501625594 -0700

DO NOT MERGE: Merge commit '2f6f6abe4d05282c82dd56fa897949f49ac3cd6c'
from oc-support-26.0-dev to stage-aosp-master.

Bug: 64219148
Test: build
Change-Id: I3a43d851a95d17df6b33ee416df178fdf494e811