tree d07db4d7f012a0d7d8a5b13a22cbb214c19e9ad1
parent 0f484233a66249d76cc25887ebec53dc8a1df89d
author James Zern <jzern@google.com> 1602030577 +0000
committer Anis Assi <anisassi@google.com> 1602202192 -0700

resolve merge conflicts of 26957fb8e6b761837a499431d79ffcc7b4be9af4 to rvc-dev

Bug: 166268541
Change-Id: I7f46cf5cccd9ac819c91e468b587efce66328347
Merged-In: I558248e2a0b4cfc4bc3d7c42c80505d82fb9804f
(cherry picked from commit 4e1c2a54e6b1b45861caa38b55655da91b9b4e94)