1. change in preparation for ExtensionRegistration. Bug: T88047 Change-Id: Ia3b84d3cb71832749ae73774dadb292dc4b9157b