Updated from global requirements

Change-Id: Id140f410c68982ff07a2334614fc927f4b4ed15f
Merge "Updated from global requirements"