Merge "Better handling for hal version 1.1" am: 365e630c77 am: 38954e0330 am: b58815e545
am: b1bcb3ce50

Change-Id: I89587d5c19bc47b41870c69336507e0bf331eec3