Updated from global requirements

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