manual merge of b7f16623 from gingerbread-plus-aosp

Change-Id: I892570586bfe3a5d5a330cb38a6ec7c3ddd69b11