Updated from global requirements

Change-Id: I4e8dfa9842a568228aa033d99db95b84ae5e24bf
Merge "Updated from global requirements"