resolved conflicts for merge of dc54a8c7 to honeycomb-merge

Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8