Updated from global requirements

Change-Id: I04df3797e0e700efc7d8cd7fa1d9f1f6ce169596