Updated from global requirements

Change-Id: I3ce9b48763b295c2e3cca2621d0f7e6fb785d38d