Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0