Merge branch 'unstable' into aibt

Change-Id: Ie2db21d698feb5f56d6267cf533d363e787222e9