bug: 194634718 Test: make Change-Id: I784f2930999871b6bb90f4e17a2ba694da35126a Merged-In: I784f2930999871b6bb90f4e17a2ba694da35126a (cherry picked from commit 9ee4e9bb)