Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test

# Conflicts:
#	app/version_code.properties
#	local.properties

diff --cc app/src/main/java/com/enqualcomm/support/CoreService.java
Simple merge

diff --cc app/src/main/java/com/ic/protocols/protocol_fzd.java
Simple merge

diff --cc app/version_code.properties
index b3fe994,5f2d7c3..279c2e8
--- 1/app/version_code.properties
--- 2/app/version_code.properties
+++ b/app/version_code.properties
@@@ -1,2 -1,5 +1,5 @@@
- #Tue Jun 29 18:09:20 CST 2021
- VERSION_CODE=840
 -#Mon Jun 28 22:42:14 CST 2021\r
 ->>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db\r
 -VERSION_CODE=879\r
 -=\=\=\=\=\=\=\r
 -<<<<<<<=HEAD\r
++#Mon Jun 28 22:42:14 CST 2021
++>>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db
++VERSION_CODE=879
++=\=\=\=\=\=\=
++<<<<<<<=HEAD