Updated from global requirements

Change-Id: Ic0fc7b639f288830e4083c9d43270633c8d655f9