Updated from global requirements

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