Merge branch 'frankie-LRX21V' into frankie-r6
Merge branch 'frankie-r6' of https://github.com/The-Ancile-Project/platform_build into dok-r7