Merge changes from topic 'thermal-notify-mr1' into oc-mr1-dev
am: 176f07a74d

Change-Id: I99ff8b001a3d9fb426345a0fc44a122d840f7b15