Merge "Fix bug patching panorama benchmark" am: 8c9803af0e am: a74e27fa53 am: c34cebcd33
am: d690433c10

Change-Id: I75aaa68e3cbcf9ea1fb69f147f612bbbbe4b1023