Updated from global requirements

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