Updated from global requirements

Change-Id: Ib25180fe110491a0d00cd5740b0296a48ff178cf