Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67
am: 92097726ef

Change-Id: I714039a80d738392c6c1d967ae4e17c0fadce8bd