This commit also replaces some tabs with spaces for homogeneity Change-Id: I4f04c0f9864a8e9b256691a9d4f40934865f419d