complete 06

Change-Id: I12a1464e7a62010056b9fe1aff94639d4a6fbbe5