Test: presubmit Bug: 137528177 Change-Id: I229b361f4950f2184f56f4cd60d45f495fa832f7 (cherry picked from commit 11b706c7)