Mark required fields

Change-Id: I656122df564bba235848d232a8263507099aa60e
Merge "Mark required fields"