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

Change-Id: Ib57d4f63cb10e015cf474b05c02f7bdddc3ba1f0