Merge "Fix ExpandableList1 sample" into jb-mr2-dev