Merge "Limit framework module api packages" into rvc-dev am: 26c1b004da

Change-Id: Ia26fa1f7271f6422f67b5ccdd84f46d1bd9340c6