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

Change-Id: Ia8eafb9049ebf0852c7885eab41bcc1a4f6af5e1