RR: detab files.

Change-Id: Id1f765118c15a88551c2b3b607f45534145ffcbb
RR: applied changes from review.

Change-Id: I2023322e58b89604cf98beed7b510eddfba65743