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

Change-Id: I2e7140f8c5ff6fb26783adcc38c03641a2e0aac8