Merge "Fix light bar flickers" into oc-dr1-dev
am: 997f2f71fa

Change-Id: I8b5fb57655afe1b9cab6afe3f5f34d48413af062