Updated from global requirements

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