Merge "Return<*> getStatus().isOk() -> isOk()" am: 3131b6fc74 am: fceda5be1c am: 6e4923dde3
am: 2e98bfb936  -s ours

Change-Id: I9e94a64410cdb84a5d7910ab81d62260e679efe1