am 15af1a12: am e704c3c9: am 41e6e50c: merge in klp-release (no-op) am: 25323fac95

Original change: undetermined

Change-Id: I35eed0bfbe5c853bd74b7bf0f0a77db9281e5258