Merge changes from topic "vintf_kernel_ver" am: f3dd36fd5c
am: 3c0032a742

Change-Id: Ic123d87f50f43a416dd95273d12c3df834473a34