Merge 5e6ec733 from gingerbread-plus-aosp

Change-Id: I85522668d103b66e9933416bb015ce4176d3842e