Updated from global requirements

Change-Id: I3525ab53d9ba4ea1476b7c53fe5420988f9d14e9