tree 4c7ee2a32a18ee1dfd5a1fe16d30499fa4c53d21
parent e5cb0a2216edc426afb3ee1263d19e67d5d8b007
author Fedor Kudasov <kudasov@google.com> 1562664178 +0000
committer Chalard Jean <jchalard@google.com> 1562664557 +0000

Revert "Cherry-pick the relevant parts of master change"

This reverts commit dd16d44fe8fb9c1191999ed0d772c9ebb4e75632.

Reason for revert: multiple build breakages b/137069068

Change-Id: If48bfa2d2cab0877a053743b3ec53820d0c4ed6b