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

Change-Id: I5cb626266b9c795f9fca4e122a83cef8da89cb9b