Updated from global requirements

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