Updated from global requirements

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