merge. repair_runtime branch.

Change-Id: Id27c627db0b22dda687754198bca623c378a9daa
merge. repair_runtime branch.

Change-Id: I1978b2def27ac90114e004859a6305be86f537cf