Updated from global requirements

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