Merge "Protect from eng vs userdebug build breaks."