Updated from global requirements

Change-Id: I39c4858101f83a269a3a0b2f1c49497eb4768001