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

Change-Id: I936a59303712b608f836abbe3486fb4b476d280d