Merge changes from topic "vintf_kernel_ver"
am: f3dd36fd5c

Change-Id: Iaa5ab2c9ef2424fc6c60aaf7edd25e79a145ad45