Updated from global requirements

Change-Id: Ia856beeccad012dd75daeae15f17e4283cfa3e6a