Updated from global requirements

Change-Id: I8458121090f305b291d0ffcd3c69631116cb6ae4