Updated from global requirements

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