tree a25e28a53501a7406b20d3f8c072b0cc35e146fa
parent ba70869b5373c12acdca8b056db47c44c85d0dce
parent ee186e90c170e3d98de905d42b8415466f6fa656
author pkanwar <pkanwar@google.com> 1493324156 -0700
committer pkanwar <pkanwar@google.com> 1493324178 -0700

resolve merge conflicts of ee186e9 to oc-dev-plus-aosp

Change-Id: I6f4b2606cc2f4e985a33f629e7861121b32a9952
Test: manual
Bug: 35606429