tree b2ca438f3bf72990e6de66ee121e1ea4831009b3
parent f6d48c4fb55472778347b0c4f5ffe306647e69b6
parent 43363243e6e542398b8fbb3f3f1f8f124125dfd1
author Mady Mellor <madym@google.com> 1523632873 -0700
committer android-build-merger <android-build-merger@google.com> 1523632873 -0700

[automerger skipped] DO NOT MERGE Fix some things in alpha branch
am: 43363243e6  -s ours

Change-Id: Ibbd2b56eb4e4eaa9f84a45ae1c433742703c337a