Merge from gingerbread-plus-aosp

Change-Id: I154071687cdd51c28bb377ea3f1e818e96909b56