Bring codebase up to date with changes made after initial codebase was pulled.

Bug: 70243090

Change-Id: I5caadb6769ab8f7c8d3ec134bf8abd58b797e80c
2 files changed