Xtra Fixes - https, version check & version 3
am: 9f6cc5e160

Change-Id: I06cbf1dc4a0a9c82f292647824f8bed44992488f