Updated from global requirements

Change-Id: I9b071e0c3e630d81963197961820e3a8aac38df6
Merge "Updated from global requirements" into stable/icehouse