Updated from global requirements

Change-Id: Ib0b13ea20541614e5963e668c5261041ae6968e0
Merge "Updated from global requirements"