am c6a04240: Merge "Change Configure structure to List<PersistableBundle>"...
am c6a04240: Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev automerge: 52920690
* commit 'c6a04240':
Change Configure structure to List<PersistableBundle>