Added test. Bug: 27906566 This reverts commit 8e2478d2. (cherry picked from commit cdca476b) Change-Id: Ia94fc7acc7ae3879921c4e8d0a02b156037ac286