Updated from global requirements

Change-Id: I2e4c372b6877710bc08d6cc2d604ef89118d1e69