Merge "Ensure extract is seen as having scalar result."
am: 2406bf1799

Change-Id: I31b4e47e90e6c25397cd2610b7594f78e575a44a