Merge "Improve consistency of stubs for framework targets" am: 9bde65264c

Change-Id: Iec43534291f671168d34d6a769c03ac5b77d11bb