Updated from global requirements

Change-Id: I3fe4ba57cf92ae2af421dd21565e68d139d533de