Reduce redundancy w/ KBV in LCBV and fix opacity wonk

Change-Id: I77ff2355940134079fbbabd9f9a73e1ea44a7481
Merge "Reduce redundancy w/ KBV in LCBV and fix opacity wonk" into kk44