Merge "Opportunistic cleanup"
am: 15da7c17b5

Change-Id: I5ac4ae5f941e741a88c595ae5f12b804a758abe6