Revert "fix Google Camera FCing on HDR+"

This reverts commit 7af7b5727d46b14340c0b40820dca59f5b3a629b.
Revert "Revert "fix Google Camera FCing on HDR+""

This reverts commit 17c5761ee7350a49f01a8a2ff06a5cb9cc6c3d6b.