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

Change-Id: Id104154ff22b642507fa71d2cd976ca36188c6e9