add ch18, ch19

Change-Id: Ic889827cc62e5bf07a046bd5bd804649655b377a