Merge "Update 4.4 to 5295618" am: ca5bc42e82 am: 8a52b89858
am: 323cd3c684

Change-Id: Ic459d6f4072296b8534625084d530842cf90dd70