Updated from global requirements

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