Merge "DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think..." into honeycomb