Initial commit of 0.6.1 + dependencies

Change-Id: I565057595a08bfca00a91b646ce021c2cacf79fa