Merge "Improve recognition of select-based period induction."
am: a818819147

Change-Id: Ideb21ef66d206966403c83bc79953720b0d529c9