Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-03-03 12:28:31 +00:00 committed by Gerrit Code Review
commit 8603bac524