Updates from ivanich's tree.

Change-Id: I8a9d3f9acb839b3857b9e279cd6d3f37f736e56b