Merge "Return<*> getStatus().isOk() -> isOk()" am: 3131b6fc74
am: fceda5be1c

Change-Id: Id1f8ea7aceff8f75e6f8b1ea79385476f1ab85e2