Xtra Fixes - https, version check & version 3
am: d09954bcf2

Change-Id: I8df83a546df6e00083c4f497cf75aa5096a3ecde