Merge "libchrome uprev to r576279 preparation"