Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp * commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c': Fix issues 2333450 and 2333559:
Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp * commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c': Fix issues 2333450 and 2333559: