This is NOT legacy

Change-Id: I0566a551fc64d218811a57a3bc770e7690299f8f
Merge "This is NOT legacy" into kk44