Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-06-10 02:59:00 +00:00 committed by Gerrit Code Review
commit b07523ab5c