Updated from global requirements

Change-Id: If0eef1ea762429b70a363bf35a2a41f0db4ba000
Merge "Updated from global requirements"