Cherry Pick of 12340 to stable/helium branch

Fixes Bug 2290

Change-Id: I8d1dc4b2b26326e2ebeb7cc9b21b42085d61829c
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Merge "Cherry Pick of 12340 to stable/helium branch" into stable/helium