latest fix working for google and cm cam

Change-Id: I68df5dfa63888fa294404a4ecd6f4b69f6506e21