Merge "Cleanup framework-all usage" am: 38ca6040ea

Change-Id: Ibd572914f2fefc2883d8514cc0a999d957cd2af3