Use supervisor

Change-Id: I40e498cdf0aff08b220befc6dc9bd03791b4c647
Signed-off-by: Zhiguang Li <muzili@gmail.com>