Merge commit 'f34cfd6a34165ce21fd1369fc89ea7d19dc111a4' into ks-aosp.lnx.3.0.r4-rel