Merge "Improve consistency of stubs for framework targets" into rvc-dev am: b992b3353b am: bffe7ce04b

Change-Id: I20c5cd9b20329b30809c9f4e3e9f6cde611d730c