[nobug] Fix typos and expansion levels

Change-Id: I8c2d987830d72bea41a6fbef7e979a4410637f99
4 files changed