Merge "Allow init to skip mounting /product and /product_services" am: 8fe0eb46c0 am: 8d464e75c9
am: d3dc311f3e

Change-Id: Ib33b129bea815a87ebf9ce8c9029537d1a4ba9b3