Dependencies from cm

Change-Id: I9cddcec34e88cd45a961da4faa61920da94aedf4
Merge "Dependencies from cm" into kk-4.4