Merge changes I6fdc87e8,I91b060b2 am: 85c5fc41de
am: 42dc8010aa

* commit '42dc8010aa3f3662214562c46843e2ecd9e28b41':
  logd: check return values
  logd: clarify release_Locked() for static analyzer