Updated from global requirements

Change-Id: I009a6494637c2daaae7a08e8ed3c6bf13155ead6