Merge "Fix bug patching panorama benchmark"
am: 8c9803af0e

Change-Id: I14b17c5be5e1ba27b443ef28424d7304b826d746