Merge changes from topic "libdrmframework"
am: 84a53822a1

Change-Id: I035c393c2e27fa83fcbcf1aa3b90b7dda5cc4ea6