Closes-Bug: #2095607 Change-Id: Ie1372ce307011c6f2560c7f1fcd520187810fab8 (cherry picked from commit fec66c1334fe798d073954002a668662065be277) (cherry picked from commit 1845fb8100cc3f3031cfe238c091ecbb2224026f)
