development: Merge 'android-4.0.4_r1.1'

Change-Id: I41967cec00fd3843395d38a38529b2d19c31eff7