Bug: 70977201 Test: none Change-Id: Ie5e62662525e69a9456d9d56f7895ee730dd8863 (cherry picked from commit 8fb657d0) Merged-In: Ie5e62662525e69a9456d9d56f7895ee730dd8863