am 1d4e3fde: (-s ours) am 7e1ce27c: Merge commit \'50738779\' into gingerbread-plus-aosp

* commit '1d4e3fdeb4d31c12e0d533eb50e335691a4956dc':
  DO NOT MERGE Fix issue #3373438: Update GBMR versions