Updated from global requirements

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