Use Sony camera workaround hack

Change-Id: I7bce28ea71c132d423e173ae25e6c05bcfcdba95