Merge commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38' * commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38': b/3004029 Fixed content resolver loss
Merge commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38' * commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38': b/3004029 Fixed content resolver loss