Merge changes from topic "tej_pull_lazy" am: eb6a9ceb2f am: 7d73b2f3ec am: 79d0c13c00

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1627635

Change-Id: I547621dd3b87adffa1c48a11ff62a7fa1245d67d