am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev

* commit 'c01d1045ef6c79000afc6f07a74ee7963a2092ac':
  Fix for bug 7400445 regression in background drawable