Updated from global requirements

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