Fixes for non-all-in-one model

Change-Id: I12ee2bc9003ab4738b003c83240ed22e1c53bc1d
3 files changed