[automerger skipped] Merge "Fix short-circuiting for RatRacheter" am:...
[automerger skipped] Merge "Fix short-circuiting for RatRacheter" am: c70a3bb9 am: b03507af -s ours
am: aca7f22b -s ours
am skip reason: change_id Iedae6b8ee9bce32024d7b9272aa458e0c89d1ad0 with SHA1 9bb1107b is in history
Change-Id: I0bf69a2d1209f20db4826aece510093e674dabd0