am 40c6d420: am a76f057a: Merge "Protect from eng vs userdebug build breaks."

* commit '40c6d420349707d0e8d4baa2bc7f53620e160cc8':
  Protect from eng vs userdebug build breaks.