Updated from global requirements

Change-Id: Ie3dd873d681b85749d48a3bb1abc90a8e8fa92c7