fixes #540 Change-Id: I6b0d970ec9d7b8603ee401d8fd41176ee0ffeae4 (cherry picked from commit 06f76e6de4)
06f76e6de4