Merge "Allow all system configs in /product" am: eca4c3a0d6
am: 0601a2a886

Change-Id: I4822a4cfddc768fd210f0fe74cf2345f88b0a1b7