Updated from global requirements

Change-Id: I47d9ed3b38f79cdb1a71f9959bc31ad7e22a2fb4