Merge "Restore reverted CleanSpec"
am: 29dddab453

Change-Id: Iec8df5b746c06678363be6565999c3744743d823