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

Change-Id: I9388b381eca411dcc702c3749834e869f8859c2e