Merge changes I4decffcc,I283e88b1
am: c651fcc98c

Change-Id: Iadafd3cb8f7ba89a50f901583e804c03761c636a