More README cleanup

Change-Id: I50b89cf35b99e862b9e1e133d88c31e413ca2c19