Merge "Opportunistic cleanup" am: 21cfbfb35b am: 293973b69c
am: 0dc0325d67

Change-Id: Iba6f93cb16f3f2501ce2596cd68d334602c9a160