tree 35f3715a5a4297f1be22466896d2a38748ea93a9
parent d7aa41ba4b6132a58478f0565ef8862ae4546d26
author Alex Fandrianto <alexfandrianto@google.com> 1463780833 -0700
committer Alex Fandrianto <alexfandrianto@google.com> 1463780833 -0700

TBR TODOs: Followup to 22594

Forgot to upload this patchset for alignment

Change-Id: I84ad7248d9641234e0f9dc3ad4a10ca799c6df71