double commit Ic910190b121194b819fd74810ff3466167f81f26 in mainline to support heat in 1404/juno, these are packaging changes

Change-Id: I2671e6140f73a0a463be54ee0a1aa02f7b2ae6fc
Merge "double commit Ic910190b121194b819fd74810ff3466167f81f26 in mainline to support heat in 1404/juno, these are packaging changes"