Merge changes I4b017701,I28aff510
am: 3e378800b8

Change-Id: Iae78bded69ec870b24666b1b0a838bfc0ff10856