Merge "lmdk: Remove redundant 'if' check" am: 6cb668b992
am: 164ea570b3

Change-Id: Idb3f3a4aa875909eacc48e03717f170e560261c0