Bug: http://b/33534933 Test: recovery_component_test passes (and fails on buggy build due to the CL in [1]). [1]: commit 7e31f421a5 Change-Id: I120498048ec1db8f9fcbb3cf135c05d3a48cfcdf
7e31f421a5