Merge "Add "require partition-exists=" support." am: 539f3ddff5
am: fea8b41aa1

Change-Id: I1a69d7c96f4b417a33d5e2d015595715401e7b14