Updated from global requirements

Change-Id: I4d453e94317cd28b2551d7168b52299b9d51413f