Bug: 31455788 Test: ./test.py --host -j40 Change-Id: Ibd75e21d6d9f19d9bb125a43a0f54262724e894c (cherry picked from commit 37aa4c99)