Updated from global requirements

Change-Id: Ifb24763ef744640daca3259a4fb4f0d839c0392c