(cherry picked from commit 58b079a2) Bug: 22914603 Change-Id: I8ae1a786702694ca2bb8707a4c142b8a233042ee