Merge changes from topic "vk-1.1.95" am: c306901bc5
am: 0df4f4eca5

Change-Id: I48b32056ddd2b4e445d161d383a8d448c94f455b