Bug: 11544667 Change-Id: Ic5156cbae41de5fbceb861c52ff19be44c95562f (cherry picked from commit 3e2244f4)