Updated from global requirements

Change-Id: Ieac82eb984bc3ce0bcde537cf1fda92d9cf97b40