Fix some missmerge / missing parts from 3.0.101 upstream

Change-Id: Ie5682908020fa0becc7af40948bbe4ea72016b42
Merge "Fix some missmerge / missing parts from 3.0.101 upstream" into kk4.4