Updated from global requirements

Change-Id: Iaea6467a2e77dab8431a1f07bdd418d92259d458