Merge \\\"Fix crash when support item is clicked.\\\" into nyc-mr1-dev am: 47c6adbd59 am: 6d820d02c8
am: 1d721de64b
Change-Id: I3fddfae3992f792c21afc1d0721ba3c78967f9ea
This commit is contained in: