Merge "Clarify comment how manifests are combined." am: ee45b5350a
am: cfcbb81e6a

Change-Id: I08c2aaefd577069d3cee394ec309c35dd7b9c611