Fix: 205976868 Test: manual, robotest build pass Change-Id: Ic056852cb2524a6724dcf4a67b535fd927478338