Updated from global requirements

Change-Id: I8b06d0788b7564942c57690b55ba58f5f2f9985b