Fixing merge issue from ag/830529

- A whole slew of changes didn't make that CL

Bug: 26043233
Change-Id: I470005f1afbf4ca23e6cfe40a497c5c67bb794aa
4 files changed