(Bug 39594) Gender neutral issue solved by adding themself or them at appropriate places

Change-Id: If04377ce58f22a2961a4db7962e116fa434209ec
Merge "(Bug 39594) Gender neutral issue solved by adding themself or them at appropriate places"