Change-Id: I60c5e9f17bf1e482e96481bcc7da46927b1300c8
README and docs to follow Change-Id: Ie395425307b9e2ec37927410653e56572a2f7690