am f144cc61: Merge "Step 24-A remove setdict" into jb-mr1-dev

* commit 'f144cc61cc9b704f890ad703c5220c3eed891743':
  Step 24-A remove setdict