Found-by: Don Lewis
Patch-by: Don Lewis

(cherry picked from commit 788b479f)

Change-Id: Idb72387186a7575989292179d52e4629415e5741