Fixes: 162480130 Test: no test required Change-Id: I4c01de14340f1801f21abd56cd5557f9f47e08b1 (cherry picked from commit f1f8c6de)