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

Change-Id: Id8ef2c9086f0cbfa69d157d8abb8c891c07fec3d