Related-Bug: #2056276 Change-Id: Iaa34624d1d85cadf1b45bec780ef8d97dd054041 (cherry picked from commit92b65a84cc) (cherry picked from commit0c1e594e45) (cherry picked from commitd59e528c74) (cherry picked from commitc52f50ee8c) (cherry picked from commitc755ca9219)