am ec3f3b92: Merge "Fix two pieces of folder jank" into jb-dev

* commit 'ec3f3b92f0d3e545f1921b6111a34541000f416c':
  Fix two pieces of folder jank