dacce73bcc
* commit '4ec33c2aad59b2a745ee891c9b7246b9533d95e0': Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.