Updated from global requirements

Change-Id: Ic493fe6cb22d1c5b2a61ad5de6cceadb684876f8