Bug: Issue 11344 Change-Id: I68aa21f81e88441f01b9386fdbf77fbb93810ec3 (cherry picked from commit 8e7bde0da1)
8e7bde0da1