[automerger skipped] Merge "Improve consistency of stubs for framework...
[automerger skipped] Merge "Improve consistency of stubs for framework targets" am: 9bde6526 am: 7efdb60c -s ours am: 635842d4 -s ours
am skip reason: Change-Id I0ddeb0c1a8764ac64980395eec8d5703ea4eea7e with SHA-1 221fe90c is in history
Change-Id: I90e38635b2a75f797d4450a3b9a2a6a08260a967