Merge "Increased number of Android log lines for tombstones"