Merge "Move system/core/ off NO_ERROR."
am: e8ab57765b

Change-Id: Ib2ad011c78eb28865cb6da5c99a078078645c579