Updated from global requirements

Change-Id: I15fd167212a4bafe94430cf4ec384592c55458a9