minor cleanup

Change-Id: I4e655bdf4d2d7fdd4c1f9be371a2787d0e60028a
Merge "minor cleanup"