Added test. Bug: 27906566 This reverts commit 8e2478d2. Change-Id: I0894f5f7cd11af29ed9d0345b51f527fc8a41d19