am 1c97c50c: am 63113994: Merge "Code cleaning for Drawables" into klp-dev

* commit '1c97c50cc7b277d30161cfe1d55b2b75118695ae':
  Code cleaning for Drawables