Updated from global requirements

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