Bug: 169864180 Test: m Change-Id: I0db7d731c3aa81b2c9331570c93ec23038bd743c (cherry picked from commit 399394b7) Merged-In: I0db7d731c3aa81b2c9331570c93ec23038bd743c