Merge "[MS11] Implement findL2Key"
am: 773f3f5bf3

Change-Id: If429108eddc802f0c13f7b10048b1fe87bd51b22