Possibly relevant to #1834 Change-Id: Iecb9161a44662f9d309a76896cc933dcb5b6c200 (cherry picked from commit 7ce993343b)
7ce993343b