Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-12-28 13:11:33 +00:00 committed by Gerrit Code Review
commit ced49ed5e3