Updated from global requirements

Change-Id: Ie6c5cfdd1e28489ed1b72d16e586edf8711626f6