Updated from global requirements

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