Merge changes from topics "rild-prop-fix", "cf-product-image" into master-cuttlefish-testing
am: bd7788c313

Change-Id: If9b1c23686036b4ee306bd5fc406ff321ec690d3