am 43215f16: am b6b5eff9: (-s ours) am 1728de00: Merge "add recovery mechanism on CORE_RESET_NTF"
am: d92746205e

Change-Id: I9aa44de176924222e6d04b3edcda3d503ca0bf76