T6: ONLY TESTING

Change-Id: Ia19b5d9116d4cbfe9f524f95358cb29bf9004b44