Source code cleanup, no bug

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