It got removed when resolving merge conflict in commit 6b22120e Bug: 153473490 Test: n/a Change-Id: I914269722d145ffe8a06589a7e5ca01db5166418