Updated from global requirements

Change-Id: Ib2765006d59122b409915dfb8c77af90abf04d59