Bring L planning scheme into master

Bug: 18899893
Change-Id: I1b3bf12e106b3b356b49b988e3980d8887d696e0
1 file changed