Updated from global requirements

Change-Id: I31214920b42dcdff8a65b584f82ddc04801604cf