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

Change-Id: I768bc38b4f7d184842f49f6c0a5ac621020d2bd4