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

Change-Id: I9cf8a3510a9178a436881d101e122a72d0c78f2e