Bug: Issue 11339 Change-Id: Ief0944afe03c55a3ee48b7ed23a3997c569b3354 (cherry picked from commit 324adea67b)
324adea67b