Updated from global requirements

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