4637f3d66d
Bug: http://b/20687795 Bug: http://b/18051137 Change-Id: Ie8af3892cfbebcc0249e7981284c4ad97ff40317 (cherry picked from commit 064a9800f372b8efd6d7b08150ab5204e5304c84)