+ a small optimization. Bug: 72222505 Test: Manual Change-Id: I0fbdee0a85c123d201b0eb6951f244540ef48117