Updated from global requirements

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