Updated from global requirements

Change-Id: I24ab22544ea4c421c511cae36148d3854f7ab745