Merge \"Fix crash when support item is clicked.\" into nyc-mr1-dev
am: 47c6adbd59

Change-Id: Ib57fd6c15b0f5990014d05aff822212fbc225475