Merge "Add a test for b/62688874."
am: 90d71886bf

Change-Id: Ic3b83487ea0afd3f492253e8ce4f726f99ab2ecf