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

Change-Id: Ief93aae77ce9cd4971275cd3dcc870cc60b95a6d