Bug: 11322014 (cherry picked from commit e206ff0f73) Change-Id: I5aaf76d7c96e4a7878946d7de337acd858c11f44
e206ff0f73