Updated from global requirements

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