Merge changes from topic "orthogonal-sm-retrieval" am: 6d4d056d6b
am: f7ead637fb

Change-Id: I7c73560c27cb2c630825a98ec42b5758ebb125f9