resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp

Change-Id: I67b9af3ef344cfa7502f780d82c1a3d8a1a33f6d