Merge "Limit btsnoop file size (3/8)" am: 37cad12cb1
am: e429211064

Change-Id: I9ce4924aba66c45425789dd16e477dfa99e6b74a