RR: pulled changes from review.

Change-Id: I4349f2b4010fdd9327bc96b0f039dfa7663911f6