am 4ae83802: am 8c8f56ca: am e62a18e5: Merge "various fixes:" into lmp-dev

* commit '4ae83802fb462233a5caea9e94cc2692ea84a389':
  various fixes: