Updated from global requirements

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