From: Amit Patankar <amitpatankar@google.com>
Date: Fri, 2 Feb 2018 18:19:24 +0000 (-0800)
Subject: Merge pull request #16699 from case540/branch_184236409
X-Git-Tag: upstream/v1.7.0~291
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=995d836e9ba7cbee56948f73bdbd099d419e4511;p=platform%2Fupstream%2Ftensorflow.git

Merge pull request #16699 from case540/branch_184236409

Branch 184236409
---

995d836e9ba7cbee56948f73bdbd099d419e4511