Merge changes from topic 'dhe-removal' am: ca5f2fc76a am: 4123fec549
am: de8237004b

Change-Id: Ib6f1715c43a020da9ecd7411e81e13d70f30c4a9