Merge "Add a test for b/62065640."
am: 1c5033a7df

Change-Id: Ieea7c58acebd2048f3d75a4fbdd61a174e05fcfa