Updated from global requirements

Change-Id: Ic16f67d84ffa4379df4d8cf5d586896178b71003