Merge "androidfw changes to support /product-services."