Merge "Fix the wrong assignment" am: cf74daba15
am: f8e84f8434

Change-Id: Ib97f79abfe85c7bb2b94aaa44a573d1cba15c329