Merge "Update for hiding Status from Return<T> object." am: c47aa53c84 am: e6d3ac9834
am: 672886dfdd

Change-Id: If28f500f8ac03b26616fd3989f495862352076a6