Fixes #1919 Change-Id: Ibac4475c96063b69868546e54e27f9f61b7b909b (cherry picked from commit 26072ed6a1)
26072ed6a1