Updated from global requirements

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