fix bugs

Change-Id: Ic2d839670f9723e8f64fda37bd028e4a9ae3caf8
Merge "fix bugs" into dev/experimental