Updated from global requirements

Change-Id: Ic90d9682a9c15795928c0c5b64c41bd06d74243a