Updated from global requirements

Change-Id: I706bb56b34c561e7042fb85ab986a1b3db0def4b