Merge "Missed submitting this in last commit."
am: 3074410651

Change-Id: Iff6b6ff7bbf51442e6b03a1bd572d027522073d3