Bug: 11565859 Change-Id: Ie33b202878356a0f22b3836b7075cb21b3cf3056 (cherry picked from commit 0cc7943b)