Updated the based on feddback from Ben.
Change-Id: I2c400f98dc80ee2583818da26466fa9eac37f281
Former-commit-id: 3d3f3a6535 [formerly dc59270db2 [formerly 56d2ffeaf8564c8ea02f52ef35e8aebea2e9f992]]
Former-commit-id: dc59270db2
Former-commit-id: e1e7f27857
Made changes suggested by Ben S.
Made other changes suggested by Ben S.
Made changes suggested by Richard Peter.
Made change from Ben S.
Change-Id: Ic7eb146c30d8024b34782187318e79882fc963bd
Former-commit-id: 325f31f6ef [formerly 044b18a356 [formerly a941dd68c3c5b42671ad78900d6d8f8231d70810]]
Former-commit-id: 044b18a356
Former-commit-id: 7457631795
Made changes suggested by Ben S.
Made other changes suggested by Ben S.
Made changes suggested by Richard Peter.
Made change from Ben S.
Change-Id: Ic7eb146c30d8024b34782187318e79882fc963bd
Former-commit-id: 384cd711db [formerly 7457631795] [formerly 044b18a356] [formerly 384cd711db [formerly 7457631795] [formerly 044b18a356] [formerly 325f31f6ef [formerly 044b18a356 [formerly a941dd68c3c5b42671ad78900d6d8f8231d70810]]]]
Former-commit-id: 325f31f6ef
Former-commit-id: 93246f1915 [formerly 6c9e4cc7a7] [formerly 74ef0f8603c293636d4544c07f275d0a1fa6d0c5 [formerly e391a0b41b]]
Former-commit-id: cd0cf98811daa71cde0a0487a9cd425c3a2b7430 [formerly 17aa893fc3]
Former-commit-id: 578273d4b6