Updated from global requirements

Change-Id: Ic8af63b4aeb04c849aeb9a62b07eeccaf911c12a