Bug: b/161896447 Test: "lunch 1" and "m nothing" Change-Id: Ifb228c0f0f634477932c9240e57170f7390201f7