Merge "Update for hiding Status from Return<T> object." am: 6bf42db77d am: 495022d1d3
am: 83f440739e

Change-Id: Ia6e1d11760d24a6f64956805f2e56849b5e94f15