Merge "Add missing targetSandbox to manifest"
am: e78a4f4df4

Change-Id: I00f239c73a929ab3c958b67f95aa5b3fcaff6978