Updated from global requirements

Change-Id: I79a5e54f094fc219d1f5f12745811c3824966309