Merge "Fix minor version bump reflected in lshal --init-vintf" am: ac6575097d
am: 99065302ed

Change-Id: Ic2a1f895312dee90e9e0eaf691edb48df4897c4e