Merge "Query cf local instance according to the result of cvd_status" am: 1771e3a12d

Change-Id: I9ff81eb89df1fc4000b05337df826b4c8ca690c0