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

Change-Id: I2ddb722ec90ea07dc0b8d234fa55ac85b2cb8d6e