[automerger skipped] Merge "DO NOT MERGE Log notification interruptions to TRON" into pi-dev am: 694b4ae846
am: 2f9218d0c9  -s ours

Change-Id: I76e583ff5ff890d0f5d3334bf5ad43cb8b084d17