Merge "Support for extensions to chips. b/11387812." into ub-gmail-ur13-dev