Updated from global requirements

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