Bug: Issue 11834 Change-Id: I1d807f3ef02fae4f83d9931c914d0639395c837c (cherry picked from commit ad5e0cc9ac)
ad5e0cc9ac