This reverts commit 0bbbf7d84e. Bug: 63632557 Change-Id: Icfd7ae4dda47449ad6178568c4bec18c898fa5b9 Signed-off-by: Thierry Strudel <tstrudel@google.com>
0bbbf7d84e