Merge "Fix b/5974247" into jb-dev