Merge "Drop current SDK as of build #635602 in jb-mr2-dev." into jb-mr2-dev