Updated from global requirements

Change-Id: Ib2515318ff672edc9dd038d2f80d9f6a9bb60428