(cherry picked from commit 7fabaa6b) Bug: 20727525 Change-Id: I91a74b793fb9eda8ed580244a6a5fd313ef2eb27