Bug: Issue 6166 Change-Id: I518534a2edfcb844c37e59f33985533e0a01bca0 (cherry picked from commit 6395853763)
6395853763