Merge branch 'rdk-next' into feature-tiny-rdk

Change-Id: I8425bfca36a50516965ef97012323aabd6f6e65a