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

Change-Id: I5a41014c62dd9c2a9c477e369007e8c5c6ce41e7