Updated from global requirements

Change-Id: Ib7410925a405797c137b882f3e91505107edbeaf