Updated from global requirements

Change-Id: Ic848c4d61a71bf4e51cfc9f424f6d0dd827fe6dc