Closed change (5/30)

Closed change