Updated from global requirements

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