Fixed morre created by cherrypick

Change-Id: I6732300189a2733aaeee95f4ec156569973926d7
Signed-off-by: KainGC <cows_say_potato@yahoo.com>