am: 056df25179 * commit '056df25179e2a6621f9abeb5cdf749387a489751': Update app context in code snippet bug: 28842396 Change-Id: I302124bb72a8162dbc0c7b1fa96c14657a86c97c
am: 056df25179 * commit '056df25179e2a6621f9abeb5cdf749387a489751': Update app context in code snippet bug: 28842396 Change-Id: I302124bb72a8162dbc0c7b1fa96c14657a86c97c