Bug 13523978 Change-Id: I0adf6e5eb95ea00fdd5741106f29f8bef749d323 (cherry picked from commit 7fcc5e2d)