uscc additions

Change-Id: Idc5d71e1eed3cf73ecb8f0bf2b95fc45b0b2f31a
uscc

Change-Id: Ic597c34c910e417e3bd45a18fa2b7e71d74f7aca