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

Change-Id: I2a3a94c50be8ada4a85bc50847593f568d897c6f