Some inline editing work

Change-Id: I3d83f7407dd28605e9ea780f1d488fd291ac77ce
18 files changed