Closes-Bug: #1378989

Change-Id: I21cf4ca48fa7d5a416893cee73025d97e8c14736
Merge "Closes-Bug: #1378989" into R1.30