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

Change-Id: I3005b92ab49ed79f854614281ef09fe5dbeea5c9