Merge "Type conversion elimination of constants"
am: 45d3efbc43

Change-Id: Ied0607c15cfa32d813702ce8237ff5255bbf7590