Bug: 169089731 Test: m -j Change-Id: I9fb8707a5eb190b5749af84e3eb65567b87439bc Merged-In: I9fb8707a5eb190b5749af84e3eb65567b87439bc (cherry picked from commit 29edf77b)