Last edits for O'Reilly before turning over to production 3/3/14

Change-Id: Ifeb2b9cf7ed330642aa942ba66e010810a42b18e