Updated from global requirements

Change-Id: Id6270a0e76e30324079a53bef99e799e271b0bb9