Merge "Fix to launch fdn activity on clicking the fdn preference." am: 2889b75e4e
am: 322b565bda

Change-Id: I50d7c665dab0dfff608918fb3d8777f866fcf9ed