Updated from global requirements

Change-Id: Iab28cdc166c480e7892c448a8e3a62a9d4d362eb