Merge changes from topic "silence_mmap_capture_fix" into pi-dev am: f255369091
am: b3015a9698

Change-Id: I87e9e40f61cf52dc11319cb267affc3df2a32fda