Merge "Remove deprecated OnItemSelectedListener and OnItemClickedListener" into lmp-mr1-ub-dev