Updated from global requirements

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