manual merge of 175a5373 from gingerbread-plus-aosp

Change-Id: I6cc3687f552bf2a89e3a496858545539ff7e0624