Merge "Limit btsnoop file size (1/8)" am: d81f127986
am: 5e7d617059

Change-Id: Id9eee6076c6712a61f47a8366187962a00890c7a