Merge "Logd retry throttling." into pi-dev am: 3ed866222d
am: 3e871cb76f

Change-Id: I33e6de119dda1209523de1fdade8e1a4c5e08da5