Bug: T362027 Change-Id: Id1329c72b81372468a98da3b47b101302c07b40d (cherry picked from commit 4c2401961f)
4c2401961f