[automerger skipped] Merge "Updates to KM4.1" am: 7b37dc5d9c am: 7b1563832e am: 51ce8b1ee8 -s ours
am skip reason: Change-Id Iae7151e2d9b328dd73e5cd78e59687ef29bab4f0 with SHA-1 2d7394209e is in history

Change-Id: I89129382b211b8c244040d2d48143aaf6c760bd1