resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp

Change-Id: I73165a3d77318cbb0271e0d5c64cc49caad8f693