second round of merge

Change-Id: Ic76e794ce88250bb8b082f55dab7cd37526ca695