Merge "Shell no longer globs, so glob in pushBackContents" am: a41b7849d0 am: 04017039b7
am: 612065e22b

Change-Id: I296bf6ce7d616e3615e2a39293b2b60c2ce85c4d