Updated from global requirements

Change-Id: Ie783701512f121acf9360ea8025e9996c67f41fb