This matches what the camera drivers use. Change-Id: I4951d31d09fc7952e5dfc49347200972aa9eeaee
Change-Id: Ic5885818c6617764c0cd82da94a50c8d30df683b