Merge "Remove ALOGD_IF_SLOW" am: d13547347f  -s ours
am: b20ff457f0  -s ours

Change-Id: Ia4fbc86830f36ef483eacd66f621c114f5ffad95