Merge "Opportunistic cleanup"
am: 21cfbfb35b

Change-Id: If2824a2c43f5d5493cd0718a9fc7a9dee5f9aba0