Updated from global requirements

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