DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged

Merged-In: I59d1aa9bf89cf29d59e72207d4e8e5900c4d5666
Change-Id: Idd10f8e55c4ec1d7e158e8627f10debccccb177c
tree: ec0c91e96351e39fbfda547d2a51c8f1a05884da
  1. framework/
  2. service/