Code cleanup, no bug

Change-Id: I3cdf897377d284cf96c4c8166ebed721269ec429
Merge "Code cleanup, no bug"