Merge "Put all updatable sources in one filegroup" am: 0223efdaa1
am: 371cf3ce5e

Change-Id: I57d7442c503d60f9f8c4935e63be456327f09574