am c6a04240: Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev automerge: 5292069
automerge: 481fc74

* commit '481fc7427b419efb98428f27c5b0e252183ff315':
  Change Configure structure to List<PersistableBundle>