This is a work-around for bug 1630748 that can be backported to
stable/newton. This workaround will be reverted in Ocata and replaced
by a proper fix.
Partial-Bug: #1630748
(cherry picked from commit abc31a7ff2)
Change-Id: I4ec9340094bc51cd8aa6e5112bf8114aa26c2982