Updated from global requirements

Change-Id: Ia3d667d3b08a69f1fd2f20e16b58ac687f485d26