Xin Li 6e0e8f25d8 Merge commit 'ba1e9e7f7893a079138330d2962ff75c35d4cae2' from ...

oc-mr1-dev-plus-aosp into stage-aosp-master.

Change-Id: I1172a1501c65f67b9c2829b739cadeb9e9ff1983

2017-11-14 11:40:13 -08:00

..

cts

Merge commit 'ba1e9e7f7893a079138330d2962ff75c35d4cae2' from

2017-11-14 11:40:13 -08:00