Commit the rest of the likely camera fix

Change-Id: Idf33f4ceb1dab6306f043150698e64a75a1e80a9