bug: 70734839 bug: 79139663 (cherry picked from commit 3377825e) Change-Id: Ia1c6cff138638d160eb5d533dc7eb03beeddba4a Merged-In: I1c391381d8bf6b69b13ea92317b7025a062ff60f