Updated from global requirements

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