Merge "Remove the unnecssary intent call." into jb-dev