[automerger skipped] Reconcile with klp-release - do not merge am: fa2ff1e0f8 -s ours

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I12887982ccea2ae133ee2a59fe6588777b45a1d3