Merge "Skip yanked packages and use newest version number." am: f50e489c40 am: 42a7aeb008

Change-Id: I3892e40e6dab66888854a7ebc6ceb719846d1645