Bug: 263488295 Merged-In: I631d305fd843f060069cce817517aeb0f745d970 Change-Id: I631d305fd843f060069cce817517aeb0f745d970 (cherry picked from commit ef08c8a7)