am c9f617a9: am b0f96e9d: Merge "Eliminate obsolete flag." into jb-dev

* commit 'c9f617a9c99f579e753a09387629f3ddac8e9ca7':
  Eliminate obsolete flag.