Fixes: 170639543 Change-Id: Ic12812efebe29aa99da93b59b6cf783097f3de76 (cherry picked from commit 74ad7213)