Merge 4.4.103 into android-4.4
am: 9fbf3d7374

Change-Id: Iba29070e10f0f3fa985bfdb0aa8b25c5370fdec0