Bug: 839893, angleproject:2549, angleproject:2550

Change-Id: Id51ad7df2dc225eb6d4e8d4a8668e7e2295d2fa3
Reviewed-on: https://chromium-review.googlesource.com/1054581
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>