Merge "DO NOT MERGE Log notification interruptions to TRON" into pi-dev
am: 694b4ae846

Change-Id: I54b861a2a4d72cfdc1734fc5528b10bce5f1d0ef