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

Change-Id: Ia6bb473054e47801ea5735b9b88237c96f609da0