Merge "Add state machine model for skipping initial brightness ramps." into oc-dev
am: 9fd3076fe6

Change-Id: If95a7b60b75f06eb3c67de24b837c26ce259db92