Bug: 18016320 (cherry picked from commit cf5f8646) Change-Id: I05c3810320d035323e5fec07712b47586eb100bb (cherry picked from commit 8afb3813)