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

Change-Id: I3cc955eb53f9efa023a23e57a1cc5a13528fbfb2