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