Fixes #1155 Change-Id: Ie63f9200f7c06b1eec6c52518d6f523f6a6a6964 (cherry picked from commit f87d753987)
f87d753987