Merge "Remove components that conflict with composite disk support." am: 5a43ac8b93 am: 74eb42a4dd am: 63698032db
am: 08b3c5469e

Change-Id: I700293135a3908834c7ff14a96d46f035fbec4fb