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

Change-Id: I71435d12e53df84c5ee0b14558b49cb497eae8f7