Merge "Change constant name from algo len to key len"
am: 197fa95ff3

Change-Id: I41402f987f9f80f2fd036e041fd664e2a3280f67