Fixes #4750 Change-Id: Icef3340dd04d1c502b1651dcc70362895f258563
Change-Id: If426c32219d32044d715ab6dfa9718807f32cb9f