Test: make Fixes: 154719656 Change-Id: I212ca5f1a48174ed85311b551259da314718f082 (cherry picked from commit 36b33527)