Updated from global requirements

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