Bug: Issue 6200 Change-Id: Ibcad93bd77835106977e72dea7d62159d5518b67 (cherry picked from commit 3750a92ff1)
3750a92ff1