Updated from global requirements

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