t6-common: Updates for lollipop

t6-common: Updates for lollipop