Updated from global requirements

Change-Id: Ia3410609208e937a47f72643a14bab9c30953bf4