Merge "Updates to KM4.1" am: 7b37dc5d9c am: 7b1563832e

Change-Id: I6fe11f610788c61e45a2aa7eb8c33af367e3f8d8