Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-08-20 16:24:02 +00:00 committed by Gerrit Code Review
commit 86a5d8b715