[automerger skipped] Merge "Cleanup framework-all usage" am: 38ca6040ea am: 5c7bc2062f am: 9c0f621c9d -s ours
am skip reason: Change-Id I16e672aaae80d8bcce25e46c34984797740aae1b with SHA-1 6fb18bbfdb is in history

Change-Id: I7c23c879458b0d9a9b0801fe140e1896a56cee5f