Bug: 131230835 Test: build and launch device locally Change-Id: I8cb20cbbebf81f9787a8250b7f53cff958e0f4c6 Merged-In: I46577b885aa6aabb2b5b31b1b92ee8a3fc3f83f5
mentioned in commit 34921c4d