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

Change-Id: Ic0d7834bdf2518cd47b7b46367b575dee9347646