Fixes: 290376750 Test: builds Change-Id: I5fc3a759462cfd4342b9330ac8978368feee26ca
mentioned in commit 86208584