Updated from global requirements

Change-Id: Ic4252b9068d29d62c785e0f85ab165d40613e582