Using his and her instead of their

Change-Id: I37d92c83376f0af9c4f74a9f873f2995daa84acf
Merge "Using his and her instead of their"