Merge "Read by UUID for PTS tests (3/5)" am: 421643aab5
am: 5c2213d7cf

Change-Id: I198eb429b0c6db32ad4b1a995b6efc744a83cf65