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

Change-Id: Ied0f1916b10b4f2edaa713716284acef1f5e3721