Updated from global requirements

Change-Id: I4577a5e16ab79203999ade8f782d7eb1b535c44d
Merge "Updated from global requirements" into milestone-proposed