Updates for U8833 / U8951

Change-Id: I0ff1f8aa410841dd7bcde418b6f5ac0e93e8fe7b