Updated from global requirements

Change-Id: I818b07404a4536a970105fc0c559050b4bed42e1