Added extra information Test: None Bug: 150126754 Merged-In: Ice5032ba84a24dd5d9091f80303ccbbc3bd1ff20 Change-Id: Ice5032ba84a24dd5d9091f80303ccbbc3bd1ff20 (cherry picked from commit f23e44e8)