Updated from global requirements

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