[automerger skipped] Merge "Fix short-circuiting for RatRacheter" into qt-qpr1-dev am: 6c8f450d
am: 50c51452 -s ours
am skip reason: change_id Iedae6b8ee9bce32024d7b9272aa458e0c89d1ad0 with SHA1 bbb806c5 is in history
Change-Id: Id930c294a327e5804a4e6bdafc587e2c284c3a2b