[automerger skipped] Merge changes from topic "remove_dev_mode" am: 8027ca9b97 am: b321ddb2f2 am: 2ba0fb04a4 -s ours
am skip reason: Change-Id I5746fe32674131b474e784bd5dd62ecff76386d5 with SHA-1 bcbe46816c is in history

Change-Id: I741817f9692267b75276a8d051dc4bbf9cc707ef