Source code cleanup, no bug

Change-Id: Ie6c266fafec54cdb4810f7e263dac0af7f8de46d
Merge "Source code cleanup, no bug"