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

* commit '001a17fcf5b825801bc9987cebab9411ce329f9d':
  Fix two pieces of folder jank