Fixed warnings.

Change-Id: I75bfe092e7a81da45da209ae0abee83325907047
Merge topic '14046_fix_selection_issues' into next

948f70f Fixed warnings.