Updated from global requirements

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