Merge "Patch relating to Issue 1456."
authorPaul Wilkins <paulwilkins@google.com>
Tue, 15 Aug 2017 14:57:56 +0000 (14:57 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 15 Aug 2017 14:57:56 +0000 (14:57 +0000)

Trivial merge