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

Change-Id: Ibb8af86673bd74fbd42de9408f36f1db2bdccb17