Updated from global requirements

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