Merge "Opportunistic cleanup" am: 15da7c17b5
am: fe9ddd50ac

Change-Id: I467dd780d1ca25ae53f3205288ec1797451a80bf