Updated from global requirements

Change-Id: I85bd2809a14b90dc6013be1ef42a3d9ec609fbaa