Updated from global requirements

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