Updated from global requirements

Change-Id: Iee27bd3f9a8d921d415e5682795e16b6e35fcce3