Merge "Use correct attribute name." into pi-dev
am: 65a411ac45

Change-Id: Ic2b5bcaa4637af3cb59c5b805e287a4c2ac6ee82