Merge changes from topics 'thermal-notif-3', 'thermal-notif' into nyc-mr2-dev
am: 0c7631f8b0

Change-Id: Ia9a3f2789fd4ec13578790e8afd557198b393809