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

Change-Id: I303f870e96935819347cb416b1ecb7bc7d7d385b