Updated from global requirements

Change-Id: I911501ee776c6470d2ed462e208f877b4536f19d