Merge "More finishing-up of cluster implementation" into oc-dev
am: baa9a3f4b9

Change-Id: Iedba1beb89d3d5fb7aa5ea8b6361e7c346521d37