Fix error in "user" generator. Bug 1399464

Change-Id: I1b8f1d002dd4679b25c7ae4fdcdb6af2ee73e933
Merge "Fix error in "user" generator. Bug 1399464"