Bug: 33192564 Test: m -j32 Change-Id: Ic80c9fa8bd81173220f4a1615e35d89b0ed621c2 (cherry picked from commit 784d3874)