resolved conflicts for merge of fca0f92e to stage-aosp-master
Elliott Hughes authored
Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74
a920f25f