Merge "Split VOLUME_EXTERNAL and VOLUME_PRIMARY." into qt-dev am: 457296a084
am: 9949446935

Change-Id: I56e9d0b17fb7031c972cfa3de500b3bf15aae7e2