Updated from global requirements

Change-Id: I4b2838822df8e6141abd7ef0f79774c6fb911e3a