Finish Chapter 7

Change-Id: I1754459b59cb9118307eddd87a7a810251c5da04