Clay's requested changes

Change-Id: I4ef6e7c08d3769377cc4dfb6f1adb25dd451782f