Updated from global requirements

Closes-Bug: #1333410

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