Fixing space/tab inconsistencies

Change-Id: Ia4a3a9fdd4c7db0de03f72703a5032081b666728