Also fix up the new support API demo documentation. Change-Id: I7a6945ffafa6a93cd394d5ce5729d6f9dfc0a183