Updated from global requirements

Change-Id: I2f927cb4cf39ea8456e87225a48ffedf36cd2ea2