Updated from global requirements

Change-Id: I67870cf6c89c968af36196b28079fa3f3c3e3fa1