am 1fd1ed86: am 13e20fc8: Merge "Drop current SDK as of build #635602 in jb-mr2-dev." into jb-mr2-dev

* commit '1fd1ed869eb84c7976ba0b3ccd3c755d5bf9a5b2':
  Drop current SDK as of build #635602 in jb-mr2-dev.