Merge "select_logpersist_title char limit" into stage-aosp-master am: cc6fd4549b am: 8ef828737f
am: 4bf1a8344f

Change-Id: I2863799d10e1aa6cc1908b5fbe8129b9d2f5dbdd