Merge "Add config to display VM number as default number of CF"
am: 3e26cb18fb

Change-Id: Ie332a31b699b375d7a9ff56f314346546244010e