Updated from global requirements

Change-Id: I7204c1858a4159b50579d5cf71ff689e5e561b26