Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev