Merge "Fix focus ordering with duplicate ids" into oc-dev am: a0ce440d60
am: 33f6bcb71d

Change-Id: I06f4cc41131ca82c6bfb75fcd174741589d936a4