Updated from global requirements

Change-Id: Id97f3f4387f9b9d7ef00ee1079a61fc08c6a1306