UG CLI edits up to the end of the chapter

Change-Id: I9ae124708b98090404ba2567e90d409fab4f36d2