Merge "Merge changes from topic "cross_AKM" into tm-dev am: 11a0b3471a am: e1547c3d54" into tm-d1-dev-plus-aosp