Merge "Merge changes from topics "ms34-tm", "ms40-clock" am: beb9fb3c am: 08c51b04 am: d312550f am: f23caaca"