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

Change-Id: Ie26b038c007c24774c8fbf1ea79695053aa47ad0