Merge "Use HAS_BUILD_NUMBER to check engineering build"
am: e8b6340578

Change-Id: I24db4e7ee8fbeddf5c66078f97387fb0c7e26fcb