Merge "Fix dependencies of packages that target earlier releases" am: 30c85e8178 am: 577d18e542 am: fa27358374
am: c64fe4f2a8

Change-Id: If125945dc87e1e71d56ac23861a9d55fd02eac70