bug: 5988656 Change-Id: Ifc3c3a2eccfc23d75b4066c2c9c02c48dacda55b
This change also removes * Unused more_keys_for_q, w, and p. Change-Id: Idb99e5f6d8c2ad2d28437f42b35b21c282cd181f
Bug: 5738545 Change-Id: I96abf6807e9375e352a505b822dd50b4d1a7a252