* commit 'eb4c0cb5098bfceae762594621f4b5125ca7bbe4': Manual frameworks/base merge from lockhotness (camera).