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

Change-Id: Ic202e8196a08c07f2131f125cae311709e0a37de