Merge \"Fix TabLayout setSelection() issues with custom views DO NOT MERGE ANYWHERE\" into nyc-dev
am: e5ff5afd3c  -s ours

Change-Id: I97ee488fe3e3f5215dcd2229e38a748ba8225a1c