retab role/glance

Change-Id: Ia24c0219c3b3ac3dc3b1f50c963f814b72302da1
Merge "retab role/glance" into production