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

Change-Id: If8b52041b2c4f41a04862a82c3c3233e22fa381f