Updated from global requirements

Change-Id: I563b1d73ce368f8b0c5c3fad93faa25582dbbb8a