Change-Id: Ic522343ee57f27706e54fcaaf053e7b3ae04324a BUG: 129345239
mentioned in commit fc42467d
mentioned in commit 12d0d5c5