Merge "Merge "Enable plug-in statusbar chip for dogfood" into udc-dev am: eef2001669 am: af45877bc0"